Merge tag 'upstream/2016.14' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 29 Nov 2016 01:10:36 +0000 (01:10 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 29 Nov 2016 01:10:36 +0000 (01:10 +0000)
Upstream version 2016.14


Trivial merge